linux: avoid need to modify include/linux/pfn.h

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c b/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c
index 2d251cfb8925ca5443617b4b94d2c519cbabc963..398db198b6d024b2ec161374cd57cb940f4a37b3 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c
+++ b/linux-2.6-xen-sparse/arch/i386/mach-xen/setup.c
@@ -67,7 +67,7 @@ char * __init machine_specific_memory_setup(void)
        if ( rc == -ENOSYS ) {
                memmap.nr_entries = 1;
                map[0].addr = 0ULL;
-               map[0].size = PFN_PHYS(xen_start_info->nr_pages);
+               map[0].size = PFN_PHYS((unsigned long long)xen_start_info->nr_pages);
                /* 8MB slack (to balance backend allocations). */
                map[0].size += 8ULL << 20;
                map[0].type = E820_RAM;

diff --git a/linux-2.6-xen-sparse/include/linux/pfn.h b/linux-2.6-xen-sparse/include/linux/pfn.h
deleted file mode 100644 (file)
index 87a4ab5..0000000
--- a/linux-2.6-xen-sparse/include/linux/pfn.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _LINUX_PFN_H_
-#define _LINUX_PFN_H_
-
-#define PFN_ALIGN(x)   (((unsigned long long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
-#define PFN_UP(x)      (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
-#define PFN_DOWN(x)    ((x) >> PAGE_SHIFT)
-#define PFN_PHYS(x)    ((unsigned long long)(x) << PAGE_SHIFT)
-
-#endif